merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 26 Aug 2010 01:29:35 +0000 (10:29 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 26 Aug 2010 01:29:35 +0000 (10:29 +0900)

Trivial merge